From: Timo Röhling <roehling@debian.org>
Date: Tue, 25 Jan 2022 20:58:25 +0000 (+0100)
Subject: Fix libstdc++ compat
X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~83
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=04df5f8f8dd1503b41ecd5c591c4cebe2ff5b962;p=filament.git

Fix libstdc++ compat
---

diff --git a/debian/patches/0003-Fix-libstdc-compat.patch b/debian/patches/0003-Fix-libstdc-compat.patch
index 4ff7a49..d5a46a5 100644
--- a/debian/patches/0003-Fix-libstdc-compat.patch
+++ b/debian/patches/0003-Fix-libstdc-compat.patch
@@ -1,11 +1,12 @@
 From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
-Date: Sat, 23 Oct 2021 20:04:38 +0200
+Date: Tue, 25 Jan 2022 21:55:31 +0100
 Subject: Fix libstdc++ compat
 
 ---
  filament/backend/include/backend/Handle.h | 2 ++
+ libs/imageio/src/BlockCompression.cpp     | 1 +
  libs/viewer/src/RemoteServer.cpp          | 1 +
- 2 files changed, 3 insertions(+)
+ 3 files changed, 4 insertions(+)
 
 diff --git a/filament/backend/include/backend/Handle.h b/filament/backend/include/backend/Handle.h
 index 62572c7..73c97fe 100644
@@ -20,6 +21,18 @@ index 62572c7..73c97fe 100644
  namespace filament {
  namespace backend {
  
+diff --git a/libs/imageio/src/BlockCompression.cpp b/libs/imageio/src/BlockCompression.cpp
+index f4e0e17..57b607e 100644
+--- a/libs/imageio/src/BlockCompression.cpp
++++ b/libs/imageio/src/BlockCompression.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <algorithm>
+ #include <cmath>
++#include <cstring>
+ #include <thread>
+ 
+ #include <astcenc.h>
 diff --git a/libs/viewer/src/RemoteServer.cpp b/libs/viewer/src/RemoteServer.cpp
 index d083dd1..441c730 100644
 --- a/libs/viewer/src/RemoteServer.cpp
diff --git a/debian/patches/0008-Migrate-to-astc-encoder-API-from-Debian-package.patch b/debian/patches/0008-Migrate-to-astc-encoder-API-from-Debian-package.patch
index 2e88d6c..2198cfe 100644
--- a/debian/patches/0008-Migrate-to-astc-encoder-API-from-Debian-package.patch
+++ b/debian/patches/0008-Migrate-to-astc-encoder-API-from-Debian-package.patch
@@ -7,18 +7,18 @@ Subject: Migrate to astc-encoder API from Debian package
  1 file changed, 75 insertions(+), 216 deletions(-)
 
 diff --git a/libs/imageio/src/BlockCompression.cpp b/libs/imageio/src/BlockCompression.cpp
-index f4e0e17..cb7d522 100644
+index 57b607e..16cc0d0 100644
 --- a/libs/imageio/src/BlockCompression.cpp
 +++ b/libs/imageio/src/BlockCompression.cpp
-@@ -20,6 +20,7 @@
- 
+@@ -21,6 +21,7 @@
  #include <algorithm>
  #include <cmath>
+ #include <cstring>
 +#include <iostream>
  #include <thread>
  
  #include <astcenc.h>
-@@ -28,22 +29,17 @@
+@@ -29,22 +30,17 @@
  #define STB_DXT_IMPLEMENTATION
  #include <stb_dxt.h>
  
@@ -46,7 +46,7 @@ index f4e0e17..cb7d522 100644
      // Check the validity of the given block size.
  
      using Format = CompressedFormat;
-@@ -80,231 +76,94 @@ CompressedTexture astcCompress(const LinearImage& original, AstcConfig config) {
+@@ -81,231 +77,94 @@ CompressedTexture astcCompress(const LinearImage& original, AstcConfig config) {
          return {};
      }